removed wrong condition check that caused tab labels not to be drawn under

2006-04-18  Carlos Garnacho  <carlosg@gnome.org>

        * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong
        condition check that caused tab labels not to be drawn under certain
        circumstances. Bug #338734.

diff --git a/ChangeLog b/ChangeLog
index 511f7705e8591b9fcf325e4cd2407e1bf67e4319..40d875b95c9f701a090a54392593196e5dd931c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-18  Carlos Garnacho  <carlosg@gnome.org>
+
+       * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong
+       condition check that caused tab labels not to be drawn under certain
+       circumstances. Bug #338734.
+
 2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
 
        * configure.in: Remove obsolete entry for no_NO

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 511f7705e8591b9fcf325e4cd2407e1bf67e4319..40d875b95c9f701a090a54392593196e5dd931c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-18  Carlos Garnacho  <carlosg@gnome.org>
+
+       * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong
+       condition check that caused tab labels not to be drawn under certain
+       circumstances. Bug #338734.
+
 2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
 
        * configure.in: Remove obsolete entry for no_NO

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e7121d63422c5c11961d9dbf4bdfb591f231b723..2800cd68ece7686c227dd3aea94b36208d4b8dde 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -5110,11 +5110,8 @@ gtk_notebook_pages_allocate (GtkNotebook              *notebook,
 
   while (children)
     {
-      page = children->data;
+      gtk_notebook_page_allocate (notebook, GTK_NOTEBOOK_PAGE (children));
       children = children->next;
-
-      if (GTK_WIDGET_DRAWABLE (page->tab_label))
-       gtk_notebook_page_allocate (notebook, page);
     }
 
   gtk_notebook_redraw_tabs (notebook);